Return explicit status for direct updates and skip descendants on conflict#14
Merged
Phlogistique merged 1 commit intoDec 25, 2025
Merged
Conversation
github-actions
Bot
deleted the
codex/add-explicit-status-in-update_direct_target
branch
December 25, 2025 16:35
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
update_direct_targetencountered merge conflicts versus succeeded.Description
update-pr-stack.shto makeupdate_direct_targetreturn0on success and1when merge conflicts are detected.return 0after the successful custom-merge path andreturn 1in the conflict handling path.mainto callupdate_branch_recursiveonly ifupdate_direct_targetreturns success, otherwise it echoes a warning like⚠️ Skipping descendants of $BRANCH until conflicts are resolved.update-pr-stack.sh.Testing
Codex Task